Tryied merging the code