fixed empty push bug
fixed merge conflicts