manually merged changes