pushing all of the current changes with hidden about
merge conflict in app asset manifest resolved
buffer bar