all conflicts resolved