Removed Git conflict crap