Entry edit WIP
Fix conflict
Edit entry