git

1.error: Your local changes to the following files would be overwritten bt merge : config/settings.py

post-thumbnail