fix conflict
merge
camera move