Fix merge clash