Fixed the code from merging