change work alias
resolved conflicts