Learn how to merge conflicts properly ;)