Fixed merge conflicts again