Fix errors and merged files