working on ERB
adding erb start
resolving conflicts