small issue fixes

small issue fixes
pulled changes
git ignore

git ignore
removed conflict

removed conflict
updated branch

updated branch