only track source files and configuration files
resolved conflicts in gitignore file