solved some conflicts
added post scaffold