pre-merge
cleaned up files
merge