fixing merge conflict take two