do it when you get conflict, after updating your branch to master