Lex lei

conflict resolution

Author: lexlei