you didn't fix conflicts properly in this file 
@AhmedOsam 
don't commit any changes until code reopen