mindless commmit
commit after mergetool