turned project into a proper template
fixed merge conflict