fixing push/pull conflict

Signed-off-by: Victor Porras <vporras@ymail.com>