File changes preparing for merge