fixing merge error + new ing
fixed merge error for origin