Actually Fixed Merge Conflicts
- Opening files works now