#13 Conflicts resolved