Messed up merge now Fixed