Sprint5 Fix Merge conflicts