still trying to get a git merge conflict
fixed conflict