merge conflict, fixed