swap height and width
merge conflict