Fixing bugs
Resolve merge conflicts