Clean and Smudge filters to help avoid merge conflicts and un-necessary commits