add merge
resolve