fixing merge head