GitConflictResolver Version 1.0 Installation: Place in ~/bin and give 755 mode Usage: Navigate to dir that has merge derps Enter: 'fixmerge' Follow instructions on screen (DO NOT EVER RUN IT FROM LOCAL DIR, THIS WILL DESTROY THE SCRIPT)