Sync after messaging move
removing merge parts