Resolved conflicts

Just commented out the original part