merge changes to correct branch