changes before holidays
conficts solved