Merged Branches

Fixed merge conflicts