Fixing conflicts in master