Cleaned up Merge Conflicts

cleaned up all conflicting code form the merge