git ignore pycharm
resolve conflict