cleanup
merging resolutions