REBASING: Fixed merging bug (same lines in 2 different functions)