conflicts resolved!