added resolve theirs option