Add billerbot resources
Resolve conflicts