Various conflicts resolved