Git merge junk removal