pause sprite
resolve merge comflict