ignoring shouldnt be so hard
fixed merge conflicts