Finished Merge
git ignore
pushing