trailing commits
adding skills
fixing conflicts