git ingnor .png
list fix/ conflict resolution