Merged into one file
Mergeding seems to be successful