Mergin some code