resolved conflicts
before merge
resolve conflics
resolve conflics
added