resolved conflicts from merge