Never gonna give you up

fixing conflicts