clearing up the merge