on ubuntu vm
fixing merge issues