Fixed merge conflicts introduced by someone else