background section finished
merging conflict resolution