camera rotation and rotation around 12.5
fixed mergeconfilcts