Fix merge errors and inconsistencies
Update dist files