Following camera
Handle merge conflicts