get rid of lame conflict files
add meta viewport tag