Update gitignor file
remove qmake stash file
Resolve conflicts
Update .gitignore