added guardfile
fixed conflicts