Removed conflicts manually