log modification
preIntegration
pull conflicts fixed