Cleaned up after merge with mergetool