edit logs page
remove marging conflict