Resolved dependency conflict

Conflict with package october/rain