print cleaning
conflicts resolved