Conflicts resolved - ok version