added charter.html.erb
fix conflicts