Fixed all the merging and reafctoring errors. Done Now.