Fixing merge stupid left in head conflict