Fixing splits
fixing merge conflict