assets added to git ignore
fix conflicts