Fix merge from origin