Fix broken commit stuff
Fix merge problems