Converted tabs to spaces, got rid of merge text