update to frontend
merge conflict resolved