proper merge conflict resolution :/