Removed some info after GIT merge

I did an abort merge, but still master was merged....sucessfully
almost...