WaterSmart-404: Resolved conflicts with directive code (pull 154).