macros for git conflict resolution; tab coloring