let the magic happengit add .git add . (push the deploy button >:) )
merged conflicts