resolved my merge conflicts