resolve comflicts
resolve comflicts