'Fix dang merge conflicts'