resolve issues due to conflict