vidyasagar - resolved conflicts and footer layout integrated