for A in "$@"
do
	modify $A \
		perl -ne '
			$print = 0;
			$conflict == 1 and /^=======$/ ? ($conflict = 2) : ($print = 1);
			/^<<<<<<< / and $conflict = 1; 
			$conflict == 0 and $print = 1;
			$conflict == 2 && /^>>>>>>> / and $conflict = 0;
			$print ? print : print STDERR'
done