Recovered from merge changes