Resolving conflicts manually