cleaned up the merge

cleaning up