commit4conflict
commitAndPush