Merge Conflicts Resolved
git ignore