i don´t know what else I had to do... just wanted to solve a conflict :-)
solved conflict...