Fixed issues with merge

Merger solved! I commented lines!