Removed the changes from another branch I accidentally merged with current