Resolved conflicts
Resolved remaining conflicts