Overwriting local entab with finished one from origin
Fixed merge conflict