Resolving merge. Git is dumb.