adding information about GIT conflict resolution
Making minor modifications
disable class file tracking.