Rebasing local conflict, due to merge
Fixing local conflicts and testing