Merged 54dd520

removing resolutions