merge conflict fixed