#6 resolved conflicts