Modified in the same line

Done.
FIxed merge

Done.