fixed even more conflicts