added code merging and quality tasks, bugs