# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 5 commits.
# The first commit's message is:
merge conflicts resolved

# This is the 2nd commit message:

use SkipException, reformat

# This is the 3rd commit message:

makes user nullable

# This is the 4th commit message:

formatting

# This is the 5th commit message:

small fix

# This is the 2nd commit message:

makes user nullable

# This is the 3rd commit message:

formatting