Conflict FINALLY fixed - clean master