deleted merge file
fixed merge issue, still vikings have trouble walking