merging drag
resolving merge