Use smerge-prev and smerge-next