merged in master and resolved conflicts