fixed conflict with merge with remote origins vals