Fixing the fixes
Resolve merge conflicts
Post merge sorting out