Fixed Merge conflicts with Parse