logbook feature and comment completed
conflicts removed