Add functions for quickly taking one side of merge conflict