merge work on epm