conflicts manually merged