Solved Colby's problem
solved my mistakes
Fixed merging issues