resolved my merge conflict