update frontend
fix conflicts