Need to do this commit in order to change branches.
Merge conflict resolution, I think