fixed conflict, duplicate header cleaned up.