How to Stop Tracking Unnecessary Files in Git, Setting IntelliJ as the Default Merge Conflict Tool & More