Clarify tab spacing
Git Conflict command