Conflicts Merged
Fixed unexpected end of file