Help merging two packages [Solved]