haml created
conflicts fixed