trying to fix the mc version merging mess