translations $ conflict fix (#177)
changelog updated