Fixed dangling merge conflict