last commit: 2014-04-28
resolve conflicts