Forgot to handle conflicts