merged with eclipse