Working changes
Resolved conflict
n/a
fix merge conflits