deleted github merge conflict data

HEAD===2f0c45f31695550 etc