Solved conflicts and corrected those disastrous merges. It's working now :-|