Unifying markup
Resolving conflicts. Git is confusing :)