small frontend fix
merge error?
fixes?