Fix merge error
Added changelog