fixing potential merge conflict