strange merge problem seems solved (going from optimistic -> master)