Conflict resolution, spaces converted to tabs