fixin' things from conflictin' merges