fixed merge problmes
gitignor