my changeset 2
commit after resolving conflicts