Merge and Tab to Spaces fix