Fix conflict
Second commit for testing rebase