Messed up merge fixed