responsive design
merge resolution