Added modified before merge
resolved conflicts