merge conflixs, php the bad parts