manually merged dev and resolved conflicts