Minimum working
Resolved conflicts