fix merge conflict comment out jiiberish