Add to dev once again
Resolve a conflict