conflict with .gitingore resolved