no conflict and resolve #7