Shell script that automatically fixes git merging conflicts the easy way.