clean up merge conflicts from 4.4.3