resolve conflicts and add template

template work in progess