Are these changes related to your PR? I think this is also an issue of rebase. Please confirm and do a rebase discarding this files changes too