Fixed some error from mergin