collition with lijos comit changes done