rush dash
remove conflicted files