merge changes back in