got down merge working