Fix merge conflict issues