Fixed weird merge conflicts.