sync packages
resolved merge conflicts on the packages