Organized merge of commits