added couts in layer.hpp, dunno whether compiles
fixed conflicts