Trying to fix merge conflict error