a bit of cleaning
conflicts