small fixes for better readability
conflict resolution