Attempting to rid of merge crap forever