updated camera view
conflicts merged