Version without conflicts