fixed some conflicting things
merged conflict