merge changes back