conflicts resolve in sunny repo