I may have fudged everything up

poorly done merges mixed with not knowing how to resolve conflicts