ctl+shift+F
resolve conflict