added modifications
resolved conflicts