Corrected merge mistakes