Resolved conflicts

I comitted and didn't pull. Conflicts resolved