Fix conflicts, and some liquid spectific files