Fix common file
New file for merging
merge