fix conflicts manually