added changes for future merge conflict