Fixed merge conflicts probably