merge errors fix
merge conflicts twice
reduce margin