cleaned up after merge conflicts