Pick/drag modified
merging