image size settings - fixing merge conflict