Lazy merge conflict