Commit before merge
Resolve conflict and add change name