Merging branches and resolving conflicts

Merging branches and their respective files and resolving the merge
conflicts within them.