Fixed merge conflicts like a boss