campfire build notification
Fix conflict resolution optimization