fixed merge conflict syntax issues