merge pointless conflict