uses gem 't-uda/haml' temporarily
implements conflict detecting