forceer merge conflict