new from scratch
resolved conflicts