All merge conflicts resolved