finally after conflicets