library model
solved conflict