Merge broke some of my stuff....iam noob