friends done
conflicts resolve