fix conflict ... now with changes