Merged branches and resolved conflicts