made change on jeremy
conflict
conflict master side
resolve
con