fixed weird merge conflict issues