seminar entity impl
fix merge