init && files copied from debauer/conflict repo