fixed what was removed from merge conflict.