finished up the editing
merge