Fixing conflicts in merging .flas.....