resolved conflicts with MYSELF GOSH!