more conflict resolution
ignore
move issues to github