I dunno the hell git doing, looks like some your changes were overwritten. Fix yourself. You love it, I know :P