changed file
fix bug
resolve merge confilict
added new function