added files for push
fixed merge in past view