How will this be solved? (usually we don't merge in pull request with todos)