file cleanup
merge conflicts fixed