Fixing conflicts and merging with latest version