Version 3 Merge Conflicts resolved