repeat changes due to conflict