updates to not get commited
accept conflicts