Cleaning to avoid merge conflicts