trying to solve merge conflict