ANother commit to resolve another conflict