not using git correctly. pushed conflict notes accidentally. fixed.