Fix step one
Fixed another merging conflict